yet more totally gratituous warning cleanups.

diff --git a/gpsbabel/cetus.c b/gpsbabel/cetus.c
index bceb5099ea03e916e726342e104110eff12fb91b..bc6c2ecc3481ca4a64ff4e2af8d342addfbdab35 100644 (file)
--- a/gpsbabel/cetus.c
+++ b/gpsbabel/cetus.c
@@ -165,8 +165,9 @@ data_read(void)
                wpt_tmp->position.latitude.degrees = be_read32(&rec->latitude) / 10000000.0;
                        
                if (be_read16(&rec->year) != 0xff) {
-                       struct tm tm = {0};
-               
+                       struct tm tm;
+
+                       memset (&tm, sizeof(tm), 0);
                        tm.tm_min = rec->min;
                        tm.tm_hour = rec->hour;
                        tm.tm_mday = rec->day;
@@ -358,5 +359,5 @@ ff_vecs_t cetus_vecs = {
        wr_deinit,
        data_read,
        data_write,
-       cetus_args
+       cetus_args,
 };

diff --git a/gpsbabel/coldsync/util.c b/gpsbabel/coldsync/util.c
index 792361740f1fc2cbe1e837fcf111e9d0b6e95039..675a683a492c3af946d11978f00d5c98bcecc022 100644 (file)
--- a/gpsbabel/coldsync/util.c
+++ b/gpsbabel/coldsync/util.c
@@ -12,7 +12,7 @@
  * native format, convert them to Palm (big-endian) format, and write
  * them to a ubyte string.
  *
- * $Id: util.c,v 1.1 2002-08-16 06:13:10 robertl Exp $
+ * $Id: util.c,v 1.2 2003-07-28 22:59:01 robertl Exp $
  */
 
 #include "config.h"
@@ -249,7 +249,7 @@ void
 debug_dump(FILE *outfile, const char *prefix,
           const ubyte *buf, const udword len)
 {
-       int lineoff;
+       unsigned int lineoff;
 
        for (lineoff = 0; lineoff < len; lineoff += 16)
        {

diff --git a/gpsbabel/copilot.c b/gpsbabel/copilot.c
index bb98370aaae8b39ae6a6d91d87307d89c4b2f75c..1147b4aac17e769eb674bc02bbf0345c39ba2f03 100644 (file)
--- a/gpsbabel/copilot.c
+++ b/gpsbabel/copilot.c
@@ -208,4 +208,5 @@ ff_vecs_t copilot_vecs = {
        wr_deinit,
        data_read,
        data_write,
+       NULL
 };

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index b1c15607cc19c66d06a551f6afcc4468028b8a29..c1202fda2ef31be59a82775c3bb1f58a9b72d9b4 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -287,5 +287,5 @@ ff_vecs_t garmin_vecs = {
        rw_deinit,
        data_read,
        data_write,
-
+       NULL
 };

diff --git a/gpsbabel/gcdb.c b/gpsbabel/gcdb.c
index 1d54eb0ce7814dd93d39c86c6247ec7ebfacbdab..9a9c7b36494437eab36005a6c71a3bafb0daca94 100644 (file)
--- a/gpsbabel/gcdb.c
+++ b/gpsbabel/gcdb.c
@@ -342,4 +342,5 @@ ff_vecs_t gcdb_vecs = {
        wr_deinit,
        data_read,
        data_write,
+       NULL
 };

diff --git a/gpsbabel/geo.c b/gpsbabel/geo.c
index 8e23c543400aad7b29c35f5f12c94efdaa0d752b..959669f55bd371cf8d7439a21d4a4cb4df4aa29d 100644 (file)
--- a/gpsbabel/geo.c
+++ b/gpsbabel/geo.c
@@ -271,4 +271,5 @@ ff_vecs_t geo_vecs = {
        geo_wr_deinit,
        geo_read,
        geo_write,
+       NULL
 };

diff --git a/gpsbabel/gpsutil.c b/gpsbabel/gpsutil.c
index 9afee7ceeb011b1e6963361597789b8509a6945a..ed5743e5a48bd2cc8d6b4513b7e2e734eccab356 100644 (file)
--- a/gpsbabel/gpsutil.c
+++ b/gpsbabel/gpsutil.c
@@ -119,4 +119,5 @@ ff_vecs_t gpsutil_vecs = {
        wr_deinit,
        data_read,
        data_write,
+       NULL
 };

diff --git a/gpsbabel/holux.c b/gpsbabel/holux.c
index 92cc31dc3bb6a2ffb0d69bcf009662deeb981e6c..3a1e8091d9bdeff40e488009a8d1502543b7d0f5 100644 (file)
--- a/gpsbabel/holux.c
+++ b/gpsbabel/holux.c
@@ -301,4 +301,5 @@ ff_vecs_t holux_vecs = {
        wr_deinit,
        data_read,
        data_write,
+       NULL
 };

diff --git a/gpsbabel/magnav.c b/gpsbabel/magnav.c
index 2788a36c88382259bdf56272afcd35691e132e20..8d61b26008013ac4da0f4f45a0380e9cae7cc062 100644 (file)
--- a/gpsbabel/magnav.c
+++ b/gpsbabel/magnav.c
@@ -109,8 +109,9 @@ data_read(void)
        for(pdb_rec = pdb->rec_index.rec; pdb_rec; pdb_rec=pdb_rec->next) {
                waypoint *wpt_tmp;
                char *vdata;
-               struct tm tm = {0};
+               struct tm tm;
 
+               memset (&tm, sizeof(tm), 0);
                wpt_tmp = xcalloc(sizeof(*wpt_tmp),1);
                rec = (struct record *) pdb_rec->data;
                wpt_tmp->position.altitude.altitude_meters = be_read32(&rec->elevation); 
@@ -272,4 +273,5 @@ ff_vecs_t magnav_vec = {
        wr_deinit,
        data_read,
        data_write,
+       NULL
 };

diff --git a/gpsbabel/mapsend.c b/gpsbabel/mapsend.c
index 743506a3db9036c63e63166880f8895bafcd05b9..eb89e72c67b0c582214c823936a0d58699e81ab1 100644 (file)
--- a/gpsbabel/mapsend.c
+++ b/gpsbabel/mapsend.c
@@ -658,4 +658,5 @@ ff_vecs_t mapsend_vecs = {
        mapsend_wr_deinit,
        mapsend_read,
        mapsend_wpt_write,
+       NULL
 };

diff --git a/gpsbabel/psp.c b/gpsbabel/psp.c
index 03884e50c2e696444936b0188509298918f92059..2451f57d1e1c1ea10abe51df8993295120d8c3d3 100644 (file)
--- a/gpsbabel/psp.c
+++ b/gpsbabel/psp.c
@@ -545,4 +545,5 @@ ff_vecs_t psp_vecs = {
        psp_wr_deinit,
        psp_read,
        psp_write,
+       NULL
 };

diff --git a/gpsbabel/quovadis.c b/gpsbabel/quovadis.c
index bcc226ae46c1cddc0128f96a9b79660e4e4448b8..4d0b9ad670998950b81dcafdb8f095815e82c51e 100644 (file)
--- a/gpsbabel/quovadis.c
+++ b/gpsbabel/quovadis.c
@@ -52,7 +52,7 @@ static struct qv_icon_mapping mapping[] = {
 #define num_mappings (sizeof(mapping) / sizeof(struct qv_icon_mapping))
 
 static geocache_type icon_to_wpt(int   icon_bitmap) {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < num_mappings; i++) {
        if (icon_bitmap == mapping[i].bitmap_id) {
@@ -63,7 +63,7 @@ static geocache_type icon_to_wpt(int  icon_bitmap) {
 }
 
 static int wpt_to_icon(geocache_type   type) {
-    int i;
+    unsigned int i;
 
     for (i = 0; i < num_mappings; i++) {
        if (type == mapping[i].gc_type) {

diff --git a/gpsbabel/tmpro.c b/gpsbabel/tmpro.c
index 50dc1619d1869a9ebcaba1672e95917aa47b8c5e..8bc695659bc23d404743b88e4acff4d72bb330b9 100644 (file)
--- a/gpsbabel/tmpro.c
+++ b/gpsbabel/tmpro.c
@@ -255,5 +255,6 @@ ff_vecs_t tmpro_vecs = {
     wr_deinit,
     data_read,
     data_write,
+    NULL
 };
 

diff --git a/gpsbabel/tpg.c b/gpsbabel/tpg.c
index 3a081cec0fc449f0a7dcd7b7efea5ce52ef2928a..0775cf9366a8178396126364405b4b57d267c5f0 100644 (file)
--- a/gpsbabel/tpg.c
+++ b/gpsbabel/tpg.c
@@ -34,7 +34,7 @@ static void *mkshort_handle;
 
 static int i_am_little_endian;
 static int endianness_tested;
-static int waypt_out_count;
+static unsigned int waypt_out_count;
 
 static void
 test_endianness(void)
@@ -394,4 +394,5 @@ ff_vecs_t tpg_vecs = {
        tpg_wr_deinit,
        tpg_read,
        tpg_write,
+       NULL
 };

diff --git a/gpsbabel/util.c b/gpsbabel/util.c
index fbca2b8be167f5d2c4076110973cd0ba2df26605..5f68ec3c18c7d7a9012a797a085ff472955945d1 100644 (file)
--- a/gpsbabel/util.c
+++ b/gpsbabel/util.c
@@ -375,7 +375,7 @@ void
 le_read64(void *dest, const void *src)
 {
        char *cdest = dest;
-       char *csrc = src;
+       const char *csrc = src;
 
        doswap(); /* make sure i_am_little_endian is initialized */